Resolve ticket #542,#543,#544,#548