merging 1.6.x modifications and correcting validation rule for PMO-2460