Merge remote-tracking branch 'dev/issue_597_new_init_attributes_fmt' into master-nopop